Change reindex to use ::es-redacted:: filtering #135414
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
tvernum
added
>enhancement
:Security/Audit
|
Pinging @elastic/es-security (Team:Security) |
|
Hi @tvernum, I've created a changelog YAML for you. |
There was a problem hiding this comment.
LGTM, with one optional nit. I'll defer to @jfreden to approve.
| @Override | ||
| public Set<String> getFilteredFields() { | ||
| return FILTERED_FIELDS; | ||
| return Set.of(); |
There was a problem hiding this comment.
Nit: Maybe put an assert false in here, since it would be a mistake to call the method? Or even just make it throw a UOE or something?
jfreden
approved these changes
Sep 25, 2025
There was a problem hiding this comment.
LGTM!
Might be overkill, but an alternative to this approach is to add a replace function to XContentMapValues
Should be fairly straight forward since we already have the filter method.
I considered that, and I think it would be helpful, but also potentially a bikeshed, so perhaps it's worth revisiting if we need this a second time. |
This was referenced Sep 26, 2025
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Sep 26, 2025
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Sep 26, 2025
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Sep 26, 2025
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 26, 2025
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 26, 2025
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 26, 2025
In audit logs we redact certain fields from the body of rest requests. This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not. Here we change the way we redact requests for reindexing to replace fields with `::es-redacted::` instead of removing them.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In audit logs we redact certain fields from the body of rest requests.
This commit changes the way we redact fields in the reindex request. Previously the only form of redaction we supported was total removal of fields, however that can be problematic when an admin wants to know whether a field was supplied or not.
Here we change the way we redact requests for reindexing to replace fields with
::es-redacted::instead of removing them.